gtk/genmarshal.pl check for unchanged autogenerated files, so we don't

* gtk/genmarshal.pl
* gtk/Makefile.am: check for unchanged autogenerated files, so
we don't rebuild everything just for adding a new function

-Yosh

diff --git a/ChangeLog b/ChangeLog
index 35e9a4b802e49f5977dda6418ee21d5c0a9706a9..cda6cabdf834a01a3cd776e735d599b7087e20fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 17 01:37:53 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/genmarshal.pl
+       * gtk/Makefile.am: check for unchanged autogenerated files, so
+       we don't rebuild everything just for adding a new function
+
 Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * gtk/gtkpixmap.h

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 35e9a4b802e49f5977dda6418ee21d5c0a9706a9..cda6cabdf834a01a3cd776e735d599b7087e20fd 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Tue Nov 17 01:37:53 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/genmarshal.pl
+       * gtk/Makefile.am: check for unchanged autogenerated files, so
+       we don't rebuild everything just for adding a new function
+
 Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * gtk/gtkpixmap.h

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 35e9a4b802e49f5977dda6418ee21d5c0a9706a9..cda6cabdf834a01a3cd776e735d599b7087e20fd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Nov 17 01:37:53 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/genmarshal.pl
+       * gtk/Makefile.am: check for unchanged autogenerated files, so
+       we don't rebuild everything just for adding a new function
+
 Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * gtk/gtkpixmap.h

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 35e9a4b802e49f5977dda6418ee21d5c0a9706a9..cda6cabdf834a01a3cd776e735d599b7087e20fd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Tue Nov 17 01:37:53 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/genmarshal.pl
+       * gtk/Makefile.am: check for unchanged autogenerated files, so
+       we don't rebuild everything just for adding a new function
+
 Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * gtk/gtkpixmap.h

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 35e9a4b802e49f5977dda6418ee21d5c0a9706a9..cda6cabdf834a01a3cd776e735d599b7087e20fd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue Nov 17 01:37:53 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/genmarshal.pl
+       * gtk/Makefile.am: check for unchanged autogenerated files, so
+       we don't rebuild everything just for adding a new function
+
 Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * gtk/gtkpixmap.h

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 35e9a4b802e49f5977dda6418ee21d5c0a9706a9..cda6cabdf834a01a3cd776e735d599b7087e20fd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Nov 17 01:37:53 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/genmarshal.pl
+       * gtk/Makefile.am: check for unchanged autogenerated files, so
+       we don't rebuild everything just for adding a new function
+
 Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * gtk/gtkpixmap.h

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 35e9a4b802e49f5977dda6418ee21d5c0a9706a9..cda6cabdf834a01a3cd776e735d599b7087e20fd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Nov 17 01:37:53 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/genmarshal.pl
+       * gtk/Makefile.am: check for unchanged autogenerated files, so
+       we don't rebuild everything just for adding a new function
+
 Mon Nov 16 19:19:00 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * gtk/gtkpixmap.h

diff --git a/gtk/.cvsignore b/gtk/.cvsignore
index 8aedc0a288465f02b74dc9c3de6761c8527ce91f..8312b5cc68c1c4876e8aeb6ec96efe3092397b52 100644 (file)
--- a/gtk/.cvsignore
+++ b/gtk/.cvsignore
@@ -22,3 +22,5 @@ gtktypebuiltins_vars.c
 gtktypebuiltins_evals.c
 gtk.defs
 testdnd
+stamp-d
+stamp-m

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index ddada2835f9fbf8e2f99ebfb760a935260828f14..fd06f46168b459dbff8a11c9284a217630c3d8fe 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -230,13 +230,14 @@ gtkinclude_HEADERS =              \
        gtkmarshal.h            \
        gtktypebuiltins.h
 
+# note gtk.defs and gtkmarshal.[ch] aren't here, but their stamps are
 BUILT_SOURCES = \
-       gtktypebuiltins.h               \
-       gtktypebuiltins_evals.c         \
-       gtktypebuiltins_ids.c           \
-        gtktypebuiltins_vars.c                 \
-       gtkmarshal.c                    \
-        gtkmarshal.h 
+       stamp-d                         \
+       stamp-m                         \
+       gtktypebuiltins.h               \
+       gtktypebuiltins_evals.c         \
+       gtktypebuiltins_ids.c           \
+        gtktypebuiltins_vars.c
 
 # cause the built sources to be rebuild when possible, even with --include-deps
 $(static_sources): $(BUILT_SOURCES)
@@ -247,11 +248,14 @@ gdk_headers = \
        ../gdk/gdkrgb.h
 
 # generate gtk.defs file from gtk-boxed.defs and *.h
-gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
+gtk.defs: @REBUILD@ stamp-d
+       @:
+stamp-d: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
        cd $(srcdir) \
        && $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \
        && cat gtk-boxed.defs >> s-gd \
-       && mv s-gd gtk.defs
+       && (cmp -s s-gd gtk.defs || mv s-gd gtk.defs) && rm -f s-gd \
+       && echo timestamp > stamp-d
 
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
 gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
@@ -278,8 +282,13 @@ gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
        s-gtbe \
        && mv s-gtbe gtktypebuiltins_evals.c
 
-gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl
-       srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl
+gtkmarshal.c gtkmarshal.h: @REBUILD@ stamp-m
+       @:
+stamp-m: @REBUILD@ gtkmarshal.list genmarshal.pl
+       srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \
+       && (cmp -s s-gmc gtkmarshal.c || mv s-gmc gtkmarshal.c) && rm -f s-gmc \
+       && (cmp -s s-gmh gtkmarshal.h || mv s-gmh gtkmarshal.h) && rm -f s-gmh \
+       && echo timestamp > stamp-m
 
 libgtk_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)

diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl
index ec1bea23a356454f939298685cbe375e525a6ae9..5ae52879e7902b7c1c74b38e0d1c33ce43cd5a75 100755 (executable)
--- a/gtk/genmarshal.pl
+++ b/gtk/genmarshal.pl
@@ -33,8 +33,8 @@ sub indent {
 }
 
 open(IL, "<$srcdir/gtkmarshal.list") || die("Open failed: $!");
-open(OH, ">$srcdir/gtkmarshal.h") || die("Open failed: $!");
-open(OS, ">$srcdir/gtkmarshal.c") || die("Open failed: $!");
+open(OH, ">$srcdir/s-gmh") || die("Open failed: $!");
+open(OS, ">$srcdir/s-gmc") || die("Open failed: $!");
 
 print OH <<EOT;
 #ifndef __GTKMARSHAL_H__
@@ -201,5 +201,5 @@ EOT
 
 close(IL); close(OH); close(OS);
 
-indent("$srcdir/gtkmarshal.h");
-indent("$srcdir/gtkmarshal.c");
+indent("$srcdir/s-gmh");
+indent("$srcdir/s-gmc");